Update patches for current gpsbabel beta.

diff --git a/debian/patches/gpsbabelfe-bin-name b/debian/patches/gpsbabelfe-bin-name
deleted file mode 100644 (file)
index d05c828..0000000
--- a/debian/patches/gpsbabelfe-bin-name
+++ /dev/null
@@ -1,13 +0,0 @@
-Strip the extra -bin from the GUI name.
-
---- a/gui/app.pro
-+++ b/gui/app.pro
-@@ -21,7 +21,7 @@ RESOURCES = app.qrc 
- RC_FILE = app.rc
- 
- win32:TARGET=gpsbabelfe
--unix:TARGET=gpsbabelfe-bin
-+unix:TARGET=gpsbabelfe
- 
- extras.commands = (make -f makeextras.mak)
- extras.target = extras

diff --git a/debian/patches/no-gpsbabel-pdf b/debian/patches/no-gpsbabel-pdf
index 909c4e075be6923b2dfd0be9b755c79f397b85f0..66855c0045779863b4fd8aa4b17dcc7d36818153 100644 (file)
--- a/debian/patches/no-gpsbabel-pdf
+++ b/debian/patches/no-gpsbabel-pdf
@@ -2,7 +2,7 @@ Don't build gpsbabel.pdf as fop is not in main.
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -241,7 +241,7 @@ changes.html: FORCE
+@@ -245,7 +245,7 @@ changes.html: FORCE
        wget -O $(WEB)/changes.html http://www.gpsbabel.org/changes.html || exit 1
        rm -f $(WEB)/changes.html.1 > /dev/null
  

diff --git a/debian/patches/series b/debian/patches/series
index c0c61e3877675b87c7ed8e9d708f6f6ce1bf8f09..10194d388330ecc7bc1796ed53973256fba5a99d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-gpsbabelfe-bin-name
 no-gpsbabel-pdf